GtkMenu: Avoid GdkDeviceManager API
authorCarlos Garnacho <carlosg@gnome.org>
Wed, 16 Dec 2015 18:24:20 +0000 (19:24 +0100)
committerCarlos Garnacho <carlosg@gnome.org>
Wed, 16 Dec 2015 18:47:07 +0000 (19:47 +0100)
We used to pick a master pointer "at random", use the default seat pointer
instead.

gtk/gtkmenu.c

index fa7eda752d9c03579dd4d83da6695a7ebff7d6ff..16d5193786af96d2e4cf4216ccd5fe5b8e7fbc00 100644 (file)
@@ -1602,17 +1602,7 @@ gtk_menu_popup_for_device (GtkMenu             *menu,
     device = NULL;
 
   if (device == NULL)
-    {
-      GdkDeviceManager *device_manager;
-      GList *devices;
-
-      device_manager = gdk_display_get_device_manager (display);
-      devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
-
-      device = devices->data;
-
-      g_list_free (devices);
-    }
+    device = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
 
   widget = GTK_WIDGET (menu);
   menu_shell = GTK_MENU_SHELL (menu);